Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 7 Jul 2011 01:44:57 +0000 (18:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 7 Jul 2011 01:44:57 +0000 (18:44 -0700)

Trivial merge